From 25ccbf4e3f982afdd8bed2993c05153bd8443419 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 13 Jan 2016 16:25:41 -0500
Subject: [PATCH] Improve docs for icon-related CSS properties

Clarify the relation between the various properties and the
icon loading functions.
---
 docs/reference/gtk/css-overview.xml   |  7 ++++---
 docs/reference/gtk/css-properties.xml | 13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/reference/gtk/css-overview.xml b/docs/reference/gtk/css-overview.xml
index 8d15f81288..497368c2ce 100644
--- a/docs/reference/gtk/css-overview.xml
+++ b/docs/reference/gtk/css-overview.xml
@@ -797,8 +797,9 @@ label {
 
     <para>
       The specified icon name is used to look up a themed icon, while taking
-      the values of the -gtk-icon-style and -gtk-icon-theme properties. This
-      kind of image is mainly used as value of the -gtk-icon-source property.
+      into account the values of the -gtk-icon-theme and -gtk-icon-palette
+      properties. This kind of image is mainly used as value of the
+      -gtk-icon-source property.
     </para>
 
     <example>
@@ -817,7 +818,7 @@ arrow.fancy {
 
     <para>
       GTK+ supports scaled rendering on hi-resolution displays. This works
-      best if images can be specify normal and hi-resolution variants. From
+      best if images can specify normal and hi-resolution variants. From
       CSS, this can be done with the -gtk-scaled syntax.
     </para>
 
diff --git a/docs/reference/gtk/css-properties.xml b/docs/reference/gtk/css-properties.xml
index 053cd14150..efcdd765d2 100644
--- a/docs/reference/gtk/css-properties.xml
+++ b/docs/reference/gtk/css-properties.xml
@@ -381,7 +381,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>✓</entry>
               <entry></entry>
               <entry></entry>
-              <entry></entry>
+              <entry>Determines the preferred style for application-loaded icons</entry>
             </row>
             <row>
               <entry>‑gtk‑icon‑theme</entry>
@@ -390,16 +390,16 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
               <entry>✓</entry>
               <entry></entry>
               <entry></entry>
-              <entry>Since 3.20</entry>
+              <entry>The icon theme to use with -gtk-icontheme(). Since 3.20</entry>
             </row>
             <row>
               <entry>‑gtk‑icon‑palette</entry>
-              <entry><code>default | 〈name〉 〈color〉 [ , 〈name〉 〈color〉 ]*</code></entry>
+              <entry><code>〈color palette〉</code></entry>
               <entry><code>default</code></entry>
               <entry>✓</entry>
               <entry>✓</entry>
               <entry></entry>
-              <entry>Since 3.20</entry>
+              <entry>Used to recolor symbolic icons (both application-loaded and from -gtk-icontheme()). Since 3.20</entry>
             </row>
             <row>
               <entry>‑gtk‑icon‑shadow</entry>
@@ -426,6 +426,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
 <literallayout><code>〈transform〉 = matrix( 〈number〉 [ , 〈number〉 ]{5} ) | translate( 〈length〉, 〈length〉 ) | translateX( 〈length〉 ) | translateY( 〈length〉 ) |</code>
 <code>                scale( 〈number〉[ , 〈number〉 ]? ) | scaleX( 〈number〉 ) | scaleY( 〈number〉 ) | rotate( 〈angle〉 ) | skew( 〈angle〉 [ , 〈angle〉 ]? ) |</code>
 <code>                skewX( 〈angle〉 ) |  skewY( 〈angle〉 )</code>
+<code>〈color palette〉 = default | 〈name〉 〈color〉 [ , 〈name〉 〈color〉 ]*</code></entry>
 </literallayout>
 
       <para>
@@ -433,8 +434,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
         as arrows, expanders, spinners, checks or radios. -gtk-icon-style and
         -gtk-icon-theme are used when resolving images using the -gtk-icontheme
         syntax. -gtk-icon-palette defines a color palette for recoloring symbolic
-        icons. The recognized names for colors in symbolic icons are "error",
-        "warning" and "success".
+        icons. The recognized names for colors in symbolic icons are error,
+        warning and success.
       </para>
 
       <table pgwide="1">
-- 
2.30.2